Merge branch '2.5.x'

Conflicts:
	build.gradle
	gradle.properties
	resources/doc.properties
	travis-build.sh

src/en/ref/Servlet API/request.gdoc

@@ -24,7 +24,7 @@ Grails enhances the @HttpServletRequest@ instance by adding the following new pr
 
 * @XML@ - An instance of @XmlSlurper@'s [GPathResult|http://groovy.codehaus.org/api/groovy/util/slurpersupport/GPathResult.html] class that allows parsing of an incoming XML request (useful for REST).
 * @JSON@ - An instance of Grails' [JSONObject|api:org.codehaus.groovy.grails.web.json.JSONObject] class that allows parsing of an incoming JSON request (useful for JSON based REST).
-* @forwardURI@ - Useful for obtaining the current request URI since the @request@ objects @requestURI@ property returns the original URI, not the matched one.
+* @forwardURI@ - Useful for obtaining the current request URI since the @request@ object's @requestURI@ property returns the original URI, not the matched one.
 * @isRedirected()@ - Returns @true@ if a redirect has been issued for this request (Grails 2+).
 * @get@ - Returns true if the current request is an HTTP @GET@ request.
 * @post@ - Returns true if the current request is an HTTP @POST@ request.