diff --git a/OSGi/com.dotcms.3rd.party/build.gradle b/OSGi/com.dotcms.3rd.party/build.gradle
index 962e098a..04011f05 100644
--- a/OSGi/com.dotcms.3rd.party/build.gradle
+++ b/OSGi/com.dotcms.3rd.party/build.gradle
@@ -11,7 +11,7 @@ repositories {
 
 dependencies {
     compile fileTree(dir: 'src/main/resources/libs', include: '*.jar')
-    compile('com.dotcms:dotcms:5.3.5') { transitive = true }
+    compile('com.dotcms:dotcms:5.3.6') { transitive = true }
 }
 
 import java.util.jar.*
diff --git a/OSGi/com.dotcms.actionlet/build.gradle b/OSGi/com.dotcms.actionlet/build.gradle
index 7a65e88c..3da643df 100644
--- a/OSGi/com.dotcms.actionlet/build.gradle
+++ b/OSGi/com.dotcms.actionlet/build.gradle
@@ -10,7 +10,7 @@ repositories {
 }
 
 dependencies {
-    compile('com.dotcms:dotcms:5.3.5') { transitive = true }
+    compile('com.dotcms:dotcms:5.3.6') { transitive = true }
 }
 
 import java.util.jar.*
diff --git a/OSGi/com.dotcms.aop/build.gradle b/OSGi/com.dotcms.aop/build.gradle
index d4556776..384a4027 100644
--- a/OSGi/com.dotcms.aop/build.gradle
+++ b/OSGi/com.dotcms.aop/build.gradle
@@ -74,10 +74,10 @@ dependencies {
 
     ajc     "org.aspectj:aspectjtools:1.8.10"
     providedCompile "org.aspectj:aspectjrt:1.8.10"
-    providedCompile (group: 'com.dotcms', name: 'dotcms', version: '5.3.5'){
+    providedCompile (group: 'com.dotcms', name: 'dotcms', version: '5.3.6'){
         transitive = true
     }
-    aspects (group: 'com.dotcms', name: 'dotcms', version: '5.3.5')
+    aspects (group: 'com.dotcms', name: 'dotcms', version: '5.3.6')
 
     providedCompile "javax.servlet:javax.servlet-api:3.1.0"
 }
diff --git a/OSGi/com.dotcms.custom.spring/build.gradle b/OSGi/com.dotcms.custom.spring/build.gradle
index f309210a..19f664d3 100644
--- a/OSGi/com.dotcms.custom.spring/build.gradle
+++ b/OSGi/com.dotcms.custom.spring/build.gradle
@@ -14,7 +14,7 @@ configurations {
 }
 
 dependencies {
-    compile('com.dotcms:dotcms:5.3.5') { transitive = true }
+    compile('com.dotcms:dotcms:5.3.6') { transitive = true }
     //Resolve dependencies. These jars can be downloaded from our Maven Repo
     //In case you want to create a Controller using other Spring version,
     //just change the version Attribute.
diff --git a/OSGi/com.dotcms.dynamic.skeleton/build.gradle b/OSGi/com.dotcms.dynamic.skeleton/build.gradle
index acb6c526..2f9f5a88 100644
--- a/OSGi/com.dotcms.dynamic.skeleton/build.gradle
+++ b/OSGi/com.dotcms.dynamic.skeleton/build.gradle
@@ -23,7 +23,7 @@ dependencies {
     // include all jars within the resource libs
     compile fileTree(dir: 'src/main/resources/libs', include: '*.jar')
     // Using all jar from artifactory part of the dotcms group
-    compile('com.dotcms:dotcms:5.3.5') { transitive = true }
+    compile('com.dotcms:dotcms:5.3.6') { transitive = true }
 }
 
 import java.util.jar.*
diff --git a/OSGi/com.dotcms.fixasset/build.gradle b/OSGi/com.dotcms.fixasset/build.gradle
index 9478abd1..da83634c 100644
--- a/OSGi/com.dotcms.fixasset/build.gradle
+++ b/OSGi/com.dotcms.fixasset/build.gradle
@@ -10,7 +10,7 @@ repositories {
 }
 
 dependencies {
-    compile('com.dotcms:dotcms:5.3.5') { transitive = true }
+    compile('com.dotcms:dotcms:5.3.6') { transitive = true }
 }
 
 import java.util.jar.*
diff --git a/OSGi/com.dotcms.hooks/build.gradle b/OSGi/com.dotcms.hooks/build.gradle
index 9d630572..dab6d986 100644
--- a/OSGi/com.dotcms.hooks/build.gradle
+++ b/OSGi/com.dotcms.hooks/build.gradle
@@ -10,7 +10,7 @@ repositories {
 }
 
 dependencies {
-    compile('com.dotcms:dotcms:5.3.5') { transitive = true }
+    compile('com.dotcms:dotcms:5.3.6') { transitive = true }
 }
 
 import java.util.jar.*
diff --git a/OSGi/com.dotcms.job/build.gradle b/OSGi/com.dotcms.job/build.gradle
index 250214f0..2cfc7b4e 100644
--- a/OSGi/com.dotcms.job/build.gradle
+++ b/OSGi/com.dotcms.job/build.gradle
@@ -10,7 +10,7 @@ repositories {
 }
 
 dependencies {
-    compile('com.dotcms:dotcms:5.3.5') { transitive = true }
+    compile('com.dotcms:dotcms:5.3.6') { transitive = true }
 }
 
 import java.util.jar.*
diff --git a/OSGi/com.dotcms.override/build.gradle b/OSGi/com.dotcms.override/build.gradle
index 83e3449e..f644de23 100644
--- a/OSGi/com.dotcms.override/build.gradle
+++ b/OSGi/com.dotcms.override/build.gradle
@@ -10,7 +10,7 @@ repositories {
 }
 
 dependencies {
-    compile('com.dotcms:dotcms:5.3.5') { transitive = true }
+    compile('com.dotcms:dotcms:5.3.6') { transitive = true }
 }
 
 import java.util.jar.*
diff --git a/OSGi/com.dotcms.portlet/build.gradle b/OSGi/com.dotcms.portlet/build.gradle
index b78ea5a8..f606f534 100644
--- a/OSGi/com.dotcms.portlet/build.gradle
+++ b/OSGi/com.dotcms.portlet/build.gradle
@@ -10,7 +10,7 @@ repositories {
 }
 
 dependencies {
-    compile('com.dotcms:dotcms:5.3.5') { transitive = true }
+    compile('com.dotcms:dotcms:5.3.6') { transitive = true }
 }
 
 import java.util.jar.*
diff --git a/OSGi/com.dotcms.pushpublish.listener/build.gradle b/OSGi/com.dotcms.pushpublish.listener/build.gradle
index 1a7d0a31..e6b69802 100644
--- a/OSGi/com.dotcms.pushpublish.listener/build.gradle
+++ b/OSGi/com.dotcms.pushpublish.listener/build.gradle
@@ -10,7 +10,7 @@ repositories {
 }
 
 dependencies {
-    compile('com.dotcms:dotcms:5.3.5') { transitive = true }
+    compile('com.dotcms:dotcms:5.3.6') { transitive = true }
 }
 
 import java.util.jar.*
diff --git a/OSGi/com.dotcms.rest/build.gradle b/OSGi/com.dotcms.rest/build.gradle
index 581c83e6..96203ca7 100644
--- a/OSGi/com.dotcms.rest/build.gradle
+++ b/OSGi/com.dotcms.rest/build.gradle
@@ -10,7 +10,7 @@ repositories {
 }
 
 dependencies {
-    compile('com.dotcms:dotcms:5.3.5') { transitive = true }
+    compile('com.dotcms:dotcms:5.3.6') { transitive = true }
 }
 
 import java.util.jar.*
diff --git a/OSGi/com.dotcms.ruleengine.velocityscriptingactionlet/build.gradle b/OSGi/com.dotcms.ruleengine.velocityscriptingactionlet/build.gradle
index 113f76d3..dd21a1fa 100644
--- a/OSGi/com.dotcms.ruleengine.velocityscriptingactionlet/build.gradle
+++ b/OSGi/com.dotcms.ruleengine.velocityscriptingactionlet/build.gradle
@@ -15,7 +15,7 @@ configurations {
 }
 
 dependencies {
-    compile('com.dotcms:dotcms:5.3.5') { transitive = true }
+    compile('com.dotcms:dotcms:5.3.6') { transitive = true }
 
     testCompile 'org.mockito:mockito-core:2.0.31-beta'
     testCompile 'org.hamcrest:hamcrest-all:1.3'
diff --git a/OSGi/com.dotcms.ruleengine.visitoripconditionlet/build.gradle b/OSGi/com.dotcms.ruleengine.visitoripconditionlet/build.gradle
index 0041da98..b501ca82 100644
--- a/OSGi/com.dotcms.ruleengine.visitoripconditionlet/build.gradle
+++ b/OSGi/com.dotcms.ruleengine.visitoripconditionlet/build.gradle
@@ -15,7 +15,7 @@ configurations {
 }
 
 dependencies {
-    compile('com.dotcms:dotcms:5.3.5') { transitive = true }
+    compile('com.dotcms:dotcms:5.3.6') { transitive = true }
 
     testCompile 'org.mockito:mockito-core:2.0.31-beta'
     testCompile 'org.hamcrest:hamcrest-all:1.3'
diff --git a/OSGi/com.dotcms.servlet/build.gradle b/OSGi/com.dotcms.servlet/build.gradle
index 77ee4937..5f73b2f4 100644
--- a/OSGi/com.dotcms.servlet/build.gradle
+++ b/OSGi/com.dotcms.servlet/build.gradle
@@ -11,7 +11,7 @@ repositories {
 
 dependencies {
     compile fileTree(dir: '../com.dotcms.simpleService/build/libs/', include: '*.jar')//As this example depends on the com.dotcms.simpleService example
-    compile('com.dotcms:dotcms:5.3.5') { transitive = true }
+    compile('com.dotcms:dotcms:5.3.6') { transitive = true }
 }
 
 import java.util.jar.*
diff --git a/OSGi/com.dotcms.simpleService/build.gradle b/OSGi/com.dotcms.simpleService/build.gradle
index 57933dfa..58cb70da 100644
--- a/OSGi/com.dotcms.simpleService/build.gradle
+++ b/OSGi/com.dotcms.simpleService/build.gradle
@@ -10,7 +10,7 @@ repositories {
 }
 
 dependencies {
-    compile('com.dotcms:dotcms:5.3.5') { transitive = true }
+    compile('com.dotcms:dotcms:5.3.6') { transitive = true }
 }
 
 import java.util.jar.*
diff --git a/OSGi/com.dotcms.spring/build.gradle b/OSGi/com.dotcms.spring/build.gradle
index c2f00e27..15aab051 100644
--- a/OSGi/com.dotcms.spring/build.gradle
+++ b/OSGi/com.dotcms.spring/build.gradle
@@ -10,7 +10,7 @@ repositories {
 }
 
 dependencies {
-    compile('com.dotcms:dotcms:5.3.5') { transitive = true }
+    compile('com.dotcms:dotcms:5.3.6') { transitive = true }
 }
 
 import java.util.jar.*
diff --git a/OSGi/com.dotcms.staticpublish.listener/build.gradle b/OSGi/com.dotcms.staticpublish.listener/build.gradle
index 01169c34..6bb1a339 100644
--- a/OSGi/com.dotcms.staticpublish.listener/build.gradle
+++ b/OSGi/com.dotcms.staticpublish.listener/build.gradle
@@ -14,7 +14,7 @@ configurations {
 }
 
 dependencies {
-    compile('com.dotcms:dotcms:5.3.5') { transitive = true }
+    compile('com.dotcms:dotcms:5.3.6') { transitive = true }
 
     compileOnly('com.hierynomus:sshj:0.23.0'){
         exclude group: 'org.bouncycastle' //Why we exlude? See README's important notes.
diff --git a/OSGi/com.dotcms.tuckey/build.gradle b/OSGi/com.dotcms.tuckey/build.gradle
index 5b8aeb59..f1257bae 100644
--- a/OSGi/com.dotcms.tuckey/build.gradle
+++ b/OSGi/com.dotcms.tuckey/build.gradle
@@ -10,7 +10,7 @@ repositories {
 }
 
 dependencies {
-    compile('com.dotcms:dotcms:5.3.5') { transitive = true }
+    compile('com.dotcms:dotcms:5.3.6') { transitive = true }
 }
 
 import java.util.jar.*
diff --git a/OSGi/com.dotcms.viewtool/build.gradle b/OSGi/com.dotcms.viewtool/build.gradle
index 2aa410f1..b87d78f5 100644
--- a/OSGi/com.dotcms.viewtool/build.gradle
+++ b/OSGi/com.dotcms.viewtool/build.gradle
@@ -10,7 +10,7 @@ repositories {
 }
 
 dependencies {
-    compile('com.dotcms:dotcms:5.3.5') { transitive = true }
+    compile('com.dotcms:dotcms:5.3.6') { transitive = true }
 }
 
 import java.util.jar.*
diff --git a/OSGi/com.dotcms.webinterceptor/build.gradle b/OSGi/com.dotcms.webinterceptor/build.gradle
index e0ae9b08..9e88bc46 100644
--- a/OSGi/com.dotcms.webinterceptor/build.gradle
+++ b/OSGi/com.dotcms.webinterceptor/build.gradle
@@ -10,7 +10,7 @@ repositories {
 }
 
 dependencies {
-    compile('com.dotcms:dotcms:5.3.5') { transitive = true }
+    compile('com.dotcms:dotcms:5.3.6') { transitive = true }
 }
 
 import java.util.jar.*
diff --git a/static/com.dotcms.hook/build.gradle b/static/com.dotcms.hook/build.gradle
index c6735cb3..59d8ba31 100644
--- a/static/com.dotcms.hook/build.gradle
+++ b/static/com.dotcms.hook/build.gradle
@@ -16,7 +16,7 @@ repositories {
 // In this section you declare the dependencies for your production and test code
 dependencies {
     compileOnly fileTree(dir: 'lib', include: '*.jar')
-    compileOnly (group: 'com.dotcms', name: 'dotcms', version: '5.3.5'){
+    compileOnly (group: 'com.dotcms', name: 'dotcms', version: '5.3.6'){
         transitive = true
     }
 }
diff --git a/static/com.dotcms.macro/build.gradle b/static/com.dotcms.macro/build.gradle
index c6735cb3..59d8ba31 100644
--- a/static/com.dotcms.macro/build.gradle
+++ b/static/com.dotcms.macro/build.gradle
@@ -16,7 +16,7 @@ repositories {
 // In this section you declare the dependencies for your production and test code
 dependencies {
     compileOnly fileTree(dir: 'lib', include: '*.jar')
-    compileOnly (group: 'com.dotcms', name: 'dotcms', version: '5.3.5'){
+    compileOnly (group: 'com.dotcms', name: 'dotcms', version: '5.3.6'){
         transitive = true
     }
 }
diff --git a/static/com.dotcms.portlet/build.gradle b/static/com.dotcms.portlet/build.gradle
index c6735cb3..59d8ba31 100644
--- a/static/com.dotcms.portlet/build.gradle
+++ b/static/com.dotcms.portlet/build.gradle
@@ -16,7 +16,7 @@ repositories {
 // In this section you declare the dependencies for your production and test code
 dependencies {
     compileOnly fileTree(dir: 'lib', include: '*.jar')
-    compileOnly (group: 'com.dotcms', name: 'dotcms', version: '5.3.5'){
+    compileOnly (group: 'com.dotcms', name: 'dotcms', version: '5.3.6'){
         transitive = true
     }
 }
diff --git a/static/com.dotcms.servlet/build.gradle b/static/com.dotcms.servlet/build.gradle
index c694dc74..8dffb48f 100644
--- a/static/com.dotcms.servlet/build.gradle
+++ b/static/com.dotcms.servlet/build.gradle
@@ -16,7 +16,7 @@ repositories {
 // In this section you declare the dependencies for your production and test code
 dependencies {
     compileOnly fileTree(dir: 'lib', include: '*.jar')
-    compileOnly (group: 'com.dotcms', name: 'dotcms', version: '5.3.5'){
+    compileOnly (group: 'com.dotcms', name: 'dotcms', version: '5.3.6'){
         transitive = true
     }
     compileOnly group: 'javax.servlet', name: 'javax.servlet-api', version: '3.0.1'
diff --git a/static/com.dotcms.skeleton/build.gradle b/static/com.dotcms.skeleton/build.gradle
index c6735cb3..59d8ba31 100644
--- a/static/com.dotcms.skeleton/build.gradle
+++ b/static/com.dotcms.skeleton/build.gradle
@@ -16,7 +16,7 @@ repositories {
 // In this section you declare the dependencies for your production and test code
 dependencies {
     compileOnly fileTree(dir: 'lib', include: '*.jar')
-    compileOnly (group: 'com.dotcms', name: 'dotcms', version: '5.3.5'){
+    compileOnly (group: 'com.dotcms', name: 'dotcms', version: '5.3.6'){
         transitive = true
     }
 }
diff --git a/static/com.dotcms.viewtool/build.gradle b/static/com.dotcms.viewtool/build.gradle
index c6735cb3..59d8ba31 100644
--- a/static/com.dotcms.viewtool/build.gradle
+++ b/static/com.dotcms.viewtool/build.gradle
@@ -16,7 +16,7 @@ repositories {
 // In this section you declare the dependencies for your production and test code
 dependencies {
     compileOnly fileTree(dir: 'lib', include: '*.jar')
-    compileOnly (group: 'com.dotcms', name: 'dotcms', version: '5.3.5'){
+    compileOnly (group: 'com.dotcms', name: 'dotcms', version: '5.3.6'){
         transitive = true
     }
 }