Merge branch 'dev'
Merge branch 'dev'
delete Guzzle
增加ini设置  更改yaf.name_separator
add Guzzle
add symfony
Merge branch 'master'

Conflicts:
	.gitignore
	lib/Guzzle/Batch/AbstractBatchDecorator.php
	lib/Guzzle/Batch/Batch.php
	lib/Guzzle/Batch/BatchBuilder.php
	lib/Guzzle/Batch/BatchClosureDivisor.php
	lib/Guzzle/Batch/BatchClosureTransfer.php
	lib/Guzzle/Batch/BatchCommandTransfer.php
	lib/Guzzle/Batch/BatchRequestTransfer.php
	lib/Guzzle/Batch/BatchSizeDivisor.php
	lib/Guzzle/Batch/Exception/BatchTransferException.php
	lib/Guzzle/Batch/ExceptionBufferingBatch.php
	lib/Guzzle/Batch/FlushingBatch.php
	lib/Guzzle/Batch/HistoryBatch.php
	lib/Guzzle/Batch/NotifyingBatch.php
	lib/Guzzle/Batch/composer.json
	lib/Guzzle/Cache/ClosureCacheAdapter.php
	lib/Guzzle/Cache/DoctrineCacheAdapter.php
	lib/Guzzle/Cache/NullCacheAdapter.php
	lib/Guzzle/Cache/Zf1CacheAdapter.php
	lib/Guzzle/Cache/Zf2CacheAdapter.php
	lib/Guzzle/Cache/composer.json
	lib/Guzzle/Common/AbstractHasDispatcher.php
	lib/Guzzle/Common/Collection.php
	lib/Guzzle/Common/Event.php
	lib/Guzzle/Common/Exception/ExceptionCollection.php
	lib/Guzzle/Common/HasDispatcherInterface.php
	lib/Guzzle/Common/Version.php
	lib/Guzzle/Common/composer.json
	lib/Guzzle/Http/AbstractEntityBodyDecorator.php
	lib/Guzzle/Http/CachingEntityBody.php
	lib/Guzzle/Http/Client.php
	lib/Guzzle/Http/ClientInterface.php
	lib/Guzzle/Http/Curl/CurlHandle.php
	lib/Guzzle/Http/Curl/CurlMulti.php
	lib/Guzzle/Http/Curl/CurlMultiProxy.php
	lib/Guzzle/Http/Curl/CurlVersion.php
	lib/Guzzle/Http/Curl/RequestMediator.php
	lib/Guzzle/Http/EntityBody.php
	lib/Guzzle/Http/Exception/BadResponseException.php
	lib/Guzzle/Http/Exception/RequestException.php
	lib/Guzzle/Http/IoEmittingEntityBody.php
	lib/Guzzle/Http/Message/AbstractMessage.php
	lib/Guzzle/Http/Message/EntityEnclosingRequest.php
	lib/Guzzle/Http/Message/EntityEnclosingRequestInterface.php
	lib/Guzzle/Http/Message/Header.php
	lib/Guzzle/Http/Message/MessageInterface.php
	lib/Guzzle/Http/Message/PostFile.php
	lib/Guzzle/Http/Message/Request.php
	lib/Guzzle/Http/Message/RequestFactory.php
	lib/Guzzle/Http/Message/RequestInterface.php
	lib/Guzzle/Http/Message/Response.php
	lib/Guzzle/Http/Mimetypes.php
	lib/Guzzle/Http/QueryAggregator/CommaAggregator.php
	lib/Guzzle/Http/QueryAggregator/DuplicateAggregator.php
	lib/Guzzle/Http/QueryAggregator/PhpAggregator.php
	lib/Guzzle/Http/QueryString.php
	lib/Guzzle/Http/ReadLimitEntityBody.php
	lib/Guzzle/Http/RedirectPlugin.php
	lib/Guzzle/Http/Url.php
	lib/Guzzle/Http/composer.json
	lib/Guzzle/Inflection/Inflector.php
	lib/Guzzle/Inflection/MemoizingInflector.php
	lib/Guzzle/Inflection/PreComputedInflector.php
	lib/Guzzle/Inflection/composer.json
	lib/Guzzle/Iterator/ChunkedIterator.php
	lib/Guzzle/Iterator/FilterIterator.php
	lib/Guzzle/Iterator/MapIterator.php
	lib/Guzzle/Iterator/composer.json
	lib/Guzzle/Log/AbstractLogAdapter.php
	lib/Guzzle/Log/ArrayLogAdapter.php
	lib/Guzzle/Log/ClosureLogAdapter.php
	lib/Guzzle/Log/LogAdapterInterface.php
	lib/Guzzle/Log/MessageFormatter.php
	lib/Guzzle/Log/MonologLogAdapter.php
	lib/Guzzle/Log/PsrLogAdapter.php
	lib/Guzzle/Log/Zf1LogAdapter.php
	lib/Guzzle/Log/Zf2LogAdapter.php
	lib/Guzzle/Log/composer.json
	lib/Guzzle/Parser/Cookie/CookieParser.php
	lib/Guzzle/Parser/Message/AbstractMessageParser.php
	lib/Guzzle/Parser/Message/MessageParser.php
	lib/Guzzle/Parser/Message/PeclHttpMessageParser.php
	lib/Guzzle/Parser/ParserRegistry.php
	lib/Guzzle/Parser/UriTemplate/PeclUriTemplate.php
	lib/Guzzle/Parser/UriTemplate/UriTemplate.php
	lib/Guzzle/Parser/Url/UrlParser.php
	lib/Guzzle/Parser/composer.json
	lib/Guzzle/Plugin/Async/AsyncPlugin.php
	lib/Guzzle/Plugin/Async/composer.json
	lib/Guzzle/Plugin/Backoff/AbstractBackoffStrategy.php
	lib/Guzzle/Plugin/Backoff/AbstractErrorCodeBackoffStrategy.php
	lib/Guzzle/Plugin/Backoff/BackoffLogger.php
	lib/Guzzle/Plugin/Backoff/BackoffPlugin.php
	lib/Guzzle/Plugin/Backoff/CallbackBackoffStrategy.php
	lib/Guzzle/Plugin/Backoff/ConstantBackoffStrategy.php
	lib/Guzzle/Plugin/Backoff/CurlBackoffStrategy.php
	lib/Guzzle/Plugin/Backoff/ExponentialBackoffStrategy.php
	lib/Guzzle/Plugin/Backoff/HttpBackoffStrategy.php
	lib/Guzzle/Plugin/Backoff/LinearBackoffStrategy.php
	lib/Guzzle/Plugin/Backoff/ReasonPhraseBackoffStrategy.php
	lib/Guzzle/Plugin/Backoff/TruncatedBackoffStrategy.php
	lib/Guzzle/Plugin/Backoff/composer.json
	lib/Guzzle/Plugin/Cache/CachePlugin.php
	lib/Guzzle/Plugin/Cache/CallbackCacheKeyProvider.php
	lib/Guzzle/Plugin/Cache/CallbackCanCacheStrategy.php
	lib/Guzzle/Plugin/Cache/DefaultCacheKeyProvider.php
	lib/Guzzle/Plugin/Cache/DefaultCacheStorage.php
	lib/Guzzle/Plugin/Cache/DefaultCanCacheStrategy.php
	lib/Guzzle/Plugin/Cache/DefaultRevalidation.php
	lib/Guzzle/Plugin/Cache/DenyRevalidation.php
	lib/Guzzle/Plugin/Cache/SkipRevalidation.php
	lib/Guzzle/Plugin/Cache/composer.json
	lib/Guzzle/Plugin/Cookie/Cookie.php
	lib/Guzzle/Plugin/Cookie/CookieJar/ArrayCookieJar.php
	lib/Guzzle/Plugin/Cookie/CookieJar/CookieJarInterface.php
	lib/Guzzle/Plugin/Cookie/CookieJar/FileCookieJar.php
	lib/Guzzle/Plugin/Cookie/CookiePlugin.php
	lib/Guzzle/Plugin/Cookie/composer.json
	lib/Guzzle/Plugin/CurlAuth/CurlAuthPlugin.php
	lib/Guzzle/Plugin/CurlAuth/composer.json
	lib/Guzzle/Plugin/ErrorResponse/ErrorResponsePlugin.php
	lib/Guzzle/Plugin/ErrorResponse/composer.json
	lib/Guzzle/Plugin/History/HistoryPlugin.php
	lib/Guzzle/Plugin/History/composer.json
	lib/Guzzle/Plugin/Log/LogPlugin.php
	lib/Guzzle/Plugin/Log/composer.json
	lib/Guzzle/Plugin/Md5/CommandContentMd5Plugin.php
	lib/Guzzle/Plugin/Md5/Md5ValidatorPlugin.php
	lib/Guzzle/Plugin/Md5/composer.json
	lib/Guzzle/Plugin/Mock/MockPlugin.php
	lib/Guzzle/Plugin/Mock/composer.json
	lib/Guzzle/Plugin/Oauth/OauthPlugin.php
	lib/Guzzle/Plugin/Oauth/composer.json
	lib/Guzzle/Plugin/composer.json
	lib/Guzzle/Service/AbstractConfigLoader.php
	lib/Guzzle/Service/Builder/ServiceBuilder.php
	lib/Guzzle/Service/Builder/ServiceBuilderLoader.php
	lib/Guzzle/Service/CachingConfigLoader.php
	lib/Guzzle/Service/Client.php
	lib/Guzzle/Service/ClientInterface.php
	lib/Guzzle/Service/Command/AbstractCommand.php
	lib/Guzzle/Service/Command/ClosureCommand.php
	lib/Guzzle/Service/Command/CommandInterface.php
	lib/Guzzle/Service/Command/DefaultRequestSerializer.php
	lib/Guzzle/Service/Command/DefaultResponseParser.php
	lib/Guzzle/Service/Command/Factory/AliasFactory.php
	lib/Guzzle/Service/Command/Factory/CompositeFactory.php
	lib/Guzzle/Service/Command/Factory/ConcreteClassFactory.php
	lib/Guzzle/Service/Command/Factory/FactoryInterface.php
	lib/Guzzle/Service/Command/Factory/MapFactory.php
	lib/Guzzle/Service/Command/Factory/ServiceDescriptionFactory.php
	lib/Guzzle/Service/Command/LocationVisitor/Request/AbstractRequestVisitor.php
	lib/Guzzle/Service/Command/LocationVisitor/Request/BodyVisitor.php
	lib/Guzzle/Service/Command/LocationVisitor/Request/HeaderVisitor.php
	lib/Guzzle/Service/Command/LocationVisitor/Request/JsonVisitor.php
	lib/Guzzle/Service/Command/LocationVisitor/Request/PostFieldVisitor.php
	lib/Guzzle/Service/Command/LocationVisitor/Request/PostFileVisitor.php
	lib/Guzzle/Service/Command/LocationVisitor/Request/QueryVisitor.php
	lib/Guzzle/Service/Command/LocationVisitor/Request/ResponseBodyVisitor.php
	lib/Guzzle/Service/Command/LocationVisitor/Request/XmlVisitor.php
	lib/Guzzle/Service/Command/LocationVisitor/Response/AbstractResponseVisitor.php
	lib/Guzzle/Service/Command/LocationVisitor/Response/BodyVisitor.php
	lib/Guzzle/Service/Command/LocationVisitor/Response/HeaderVisitor.php
	lib/Guzzle/Service/Command/LocationVisitor/Response/JsonVisitor.php
	lib/Guzzle/Service/Command/LocationVisitor/Response/ReasonPhraseVisitor.php
	lib/Guzzle/Service/Command/LocationVisitor/Response/ResponseVisitorInterface.php
	lib/Guzzle/Service/Command/LocationVisitor/Response/StatusCodeVisitor.php
	lib/Guzzle/Service/Command/LocationVisitor/Response/XmlVisitor.php
	lib/Guzzle/Service/Command/LocationVisitor/VisitorFlyweight.php
	lib/Guzzle/Service/Command/OperationCommand.php
	lib/Guzzle/Service/Command/OperationResponseParser.php
	lib/Guzzle/Service/Description/Operation.php
	lib/Guzzle/Service/Description/SchemaFormatter.php
	lib/Guzzle/Service/Description/SchemaValidator.php
	lib/Guzzle/Service/Description/ServiceDescription.php
	lib/Guzzle/Service/Description/ServiceDescriptionLoader.php
	lib/Guzzle/Service/Resource/AbstractResourceIteratorFactory.php
	lib/Guzzle/Service/Resource/CompositeResourceIteratorFactory.php
	lib/Guzzle/Service/Resource/MapResourceIteratorFactory.php
	lib/Guzzle/Service/Resource/Model.php
	lib/Guzzle/Service/Resource/ResourceIterator.php
	lib/Guzzle/Service/Resource/ResourceIteratorApplyBatched.php
	lib/Guzzle/Service/Resource/ResourceIteratorClassFactory.php
	lib/Guzzle/Service/Resource/ResourceIteratorFactoryInterface.php
	lib/Guzzle/Service/composer.json
	lib/Guzzle/Stream/PhpStreamRequestFactory.php
	lib/Guzzle/Stream/Stream.php
	lib/Guzzle/Stream/StreamInterface.php
	lib/Guzzle/Stream/composer.json
	site/fish.com/www/controllers/Home.php