Merge branch 'php_package' of https://github.com/wing328/swagger-codegen into php_package

Conflicts:
	modules/swagger-codegen/src/main/resources/php/APIClient.mustache
	samples/client/petstore/php/SwaggerPetstore-php/lib/APIClient.php
	samples/client/petstore/php/SwaggerPetstore-php/lib/PetApi.php
	samples/client/petstore/php/SwaggerPetstore-php/lib/StoreApi.php
	samples/client/petstore/php/SwaggerPetstore-php/lib/UserApi.php
	samples/client/petstore/php/SwaggerPetstore-php/lib/models/Category.php
	samples/client/petstore/php/SwaggerPetstore-php/lib/models/Order.php
	samples/client/petstore/php/SwaggerPetstore-php/lib/models/Pet.php
	samples/client/petstore/php/SwaggerPetstore-php/lib/models/Tag.php
	samples/client/petstore/php/SwaggerPetstore-php/lib/models/User.php

Author: wing328