Merge branch 'master' into release/28.0.0

Conflicts:
	LICENSE.md
	README.md
	pom.xml
	sfdc-wsc-rest/src/main/java/com/sforce/rest/ContentType.java
	sfdc-wsc-rest/src/main/java/com/sforce/rest/DescribeGlobal.java
	sfdc-wsc-rest/src/main/java/com/sforce/rest/DescribeLayout.java
	sfdc-wsc-rest/src/main/java/com/sforce/rest/DescribeSobject.java
	sfdc-wsc-rest/src/main/java/com/sforce/rest/QueryResult.java
	sfdc-wsc-rest/src/main/java/com/sforce/rest/RestApiException.java
	sfdc-wsc-rest/src/main/java/com/sforce/rest/RestConnection.java
	sfdc-wsc-rest/src/main/java/com/sforce/rest/RestConnectionImpl.java
	sfdc-wsc-rest/src/main/java/com/sforce/rest/RestExceptionCode.java
	sfdc-wsc-rest/src/main/java/com/sforce/rest/SObjectResult.java
	sfdc-wsc-rest/src/main/java/com/sforce/rest/SearchResult.java
	sfdc-wsc-rest/src/main/java/com/sforce/rest/pojo/SObject.java
	sfdc-wsc-tools/src/main/java/com/sforce/ws/template/Expression.java
	sfdc-wsc-tools/src/main/java/com/sforce/ws/template/JspParser.java
	sfdc-wsc-tools/src/main/java/com/sforce/ws/template/JspTokenizer.java
	sfdc-wsc-tools/src/main/java/com/sforce/ws/template/Main.java
	sfdc-wsc-tools/src/main/java/com/sforce/ws/template/Scriptlet.java
	sfdc-wsc-tools/src/main/java/com/sforce/ws/template/Template.java
	sfdc-wsc-tools/src/main/java/com/sforce/ws/template/Text.java
	sfdc-wsc-tools/src/main/java/com/sforce/ws/tools/ComplexTypeGenerator.java
	sfdc-wsc-tools/src/main/java/com/sforce/ws/tools/ConnectionGenerator.java
	sfdc-wsc-tools/src/main/java/com/sforce/ws/tools/SimpleTypeGenerator.java
	sfdc-wsc-tools/src/main/java/com/sforce/ws/tools/TypeGenerator.java
	sfdc-wsc-tools/src/main/java/com/sforce/ws/tools/wsdlc.java
	sfdc-wsc-tools/src/main/resources/com/sforce/ws/tools/connection.template
	sfdc-wsc-tools/src/main/resources/com/sforce/ws/tools/connector.template
	sfdc-wsc-tools/src/main/resources/com/sforce/ws/tools/simpleType.template
	sfdc-wsc-tools/src/main/resources/com/sforce/ws/tools/type.template
	sfdc-wsc-ws/src/main/java/com/sforce/ws/bind/XMLizable.java
	sfdc-wsc-ws/src/main/java/com/sforce/ws/wsdl/SoapBody.java
	src/main/java/com/sforce/rest/DescribeGlobal.java
	src/main/java/com/sforce/rest/QueryResult.java
	src/main/java/com/sforce/rest/SObjectResult.java
	src/main/java/com/sforce/rest/SearchResult.java
	src/main/java/com/sforce/ws/codegen/ConnectionMetadataConstructor.java
	src/main/java/com/sforce/ws/codegen/TypeMetadataConstructor.java
	src/main/java/com/sforce/ws/codegen/metadata/ClassMetadata.java
	src/main/java/com/sforce/ws/codegen/metadata/ElementMetadata.java
	src/main/java/com/sforce/ws/codegen/templates/aggregateResult.st
	src/main/java/com/sforce/ws/codegen/templates/connector.st
	src/main/java/com/sforce/ws/codegen/templates/sobject.st
	src/main/java/com/sforce/ws/tools/ComplexTypeGenerator.java
	src/main/java/com/sforce/ws/tools/ConnectionGenerator.java
	src/main/java/com/sforce/ws/tools/aggregateResult.template
	src/main/java/com/sforce/ws/tools/connector.template
	src/main/java/com/sforce/ws/tools/sobject.template
	src/test/resources/codegeneration/AggregateResult.java
	src/test/resources/codegeneration/SObject.java
Fix bug where the class ConnectionCodeGeneratorTest call fails if run on UNIX/Linux:
- Add '.gitattributes' to always have LF line endings on checkout for the '*.st' template files.
- Reverted the resource 'PartnerConnection.java' used by ConnectionCodeGeneratorTest to validate the rendered Java code by removing the previously added empty lines. Indeed those empty lines were intended to make it work on Windows but then make the test fail on UNIX/Linux).

More details:
- Differences between StringTemplate v3 and v4: "\n in a template becomes \r\n or \n in output depending on platform." (http://www.antlr.org/wiki/display/ST4/Differences+between+v3+and+v4)
- Declare files that will always have LF line endings on checkout. (https://help.github.com/articles/dealing-with-line-endings)