Regular merge of develop

.ci/.autoRedirect

@@ -35,11 +35,11 @@
             if (sub.length > 0) {
                 UrlExists(internalURL+'/stable/internal/'+sub, function(status){
                     if (status == 200) { // if sub-card is internal in the internal directory and exists
-                        window.location.href = internalURL+'/stable/internal/'+sub;
+                        window.location.href = internalURL+'/stable/internal/cards/'+sub;
                     } else {
                         UrlExists(internalURL+'/stable/external/'+sub, function(status){
                             if (status == 200) { // if sub-card is internal in the external directory and exists
-                                window.location.href = internalURL+'/stable/external/'+sub;
+                                window.location.href = internalURL+'/stable/external/cards/'+sub;
                             } else {
                                 window.location.href = internalURL+'/stable/404.html';
                             }
@@ -58,9 +58,9 @@
         // external pages
         } else {
             if (sub.length > 0) { sub = 'external/'+sub; }
-            UrlExists(externalURL+'/stable/'+sub, function(status){
-                if (status == 200) { // if sub-car is internal and exists
-                    window.location.href = externalURL+'/stable/'+sub;
+            UrlExists(externalURL+'/stable/cards/'+sub, function(status){
+                if (status == 200) { // if sub-card is internal and exists
+                    window.location.href = externalURL+'/stable/cards/'+sub;
                 } else {
                     window.location.href = externalURL+'/stable/404.html';
                 }