Add parameter to force client config of port
Revert "Add parameter to force client config of port"

This reverts commit 5f62ec1f70a8085a45b1466a7bfefd5954df7342.
Add manual override for forcing client port config
fixing debug statement
Merge branch 'master' of https://github.com/Netflix/ribbon
move port changes to discoveryniwsserverlist load balancer
add apache copyright header
Merge pull request #65 from zarfide/master

Add client port config override
Update CHANGES.md
[Gradle Release Plugin] - new version commit:  '0.3.6'.
Added new test for overriding deserializer.
Merge branch 'master' of https://github.com/Netflix/ribbon into cp
Merge pull request #68 from allenxwang/cp

Reopen closed but not merged pull request https://github.com/Netflix/ribbon/pull/64
[Gradle Release Plugin] - new version commit:  '0.3.7'.
Changed the serialization framework interface to add generic type for Serializer and Deserializer.

Rename ContentTypeBasedKey to HttpSerializationContext.

Added HttpHeaders implementations for all clients.

Merge branch 'master' of https://github.com/Netflix/ribbon into 1.x

Conflicts:
	gradle.properties
	ribbon-core/src/main/java/com/netflix/client/config/CommonClientConfigKey.java