Index: branches/1.2.x/platform/inc/ajax.js
===================================================================
diff -u -N -r14274 -r14561
--- branches/1.2.x/platform/inc/ajax.js	(.../ajax.js)	(revision 14274)
+++ branches/1.2.x/platform/inc/ajax.js	(.../ajax.js)	(revision 14561)
@@ -76,7 +76,7 @@
 }
 
 Request.processRedirect = function($request) {
-	var $match_redirect = new RegExp('^#redirect#(.*)').exec($request.responseText);
+	var $match_redirect = new RegExp('^#redirect#(.*?)($|\\s.*)').exec($request.responseText);
 	if ($match_redirect != null) {
 		// redirect to external template requested
 		window.location.href = $match_redirect[1];
Index: branches/1.2.x/in-news/articles/article_detail.tpl
===================================================================
diff -u -N -r14274 -r14561
--- branches/1.2.x/in-news/articles/article_detail.tpl	(.../article_detail.tpl)	(revision 14274)
+++ branches/1.2.x/in-news/articles/article_detail.tpl	(.../article_detail.tpl)	(revision 14561)
@@ -97,7 +97,7 @@
 								<inp2:m_if check="n_Field" name="cust_RssOriginalURL" inverse="1">
 								<td class="picture-padding" style="padding-left:25px" valign="top">
 									<inp2:m_if check="n_ImageSrc" MaxWidth="fullsize">
-										<a href="<inp2:n_ImageSrc MaxWidth="fullsize" DefaultImage="platform/img/no_picture.gif"/>" class="thickbox" rel="article-images" title="<inp2:l_Field name='PrimaryImageAlt' html_escape='1'/>">
+										<a href="<inp2:n_ImageSrc MaxWidth="fullsize" DefaultImage="platform/img/no_picture.gif"/>" class="thickbox" rel="article-images" title="<inp2:n_Field name='PrimaryImageAlt' html_escape='1'/>">
 											<inp2:n_Image render_as="image_element" Primary="1" MaxWidth="thumbnail" DefaultWidth="150" DefaultImage="platform/img/no_picture.gif"/><br />
 										</a>
 									<inp2:m_else/>
Index: branches/1.2.x/platform/inc/jquery/thickbox/thickbox.js
===================================================================
diff -u -N -r14274 -r14561
--- branches/1.2.x/platform/inc/jquery/thickbox/thickbox.js	(.../thickbox.js)	(revision 14274)
+++ branches/1.2.x/platform/inc/jquery/thickbox/thickbox.js	(.../thickbox.js)	(revision 14561)
@@ -349,7 +349,7 @@
 }
 
 TB.parseRedirect = function ($data) {
-	var $match_redirect = new RegExp('^#redirect#(.*)').exec($data);
+	var $match_redirect = new RegExp('^#redirect#(.*?)($|\\s.*)').exec($data);
 	if ($match_redirect != null) {
 		// redirect to external template requested
 		return $match_redirect[1];
Index: branches/1.2.x/platform/elements/html_head.elm.tpl
===================================================================
diff -u -N -r14274 -r14561
--- branches/1.2.x/platform/elements/html_head.elm.tpl	(.../html_head.elm.tpl)	(revision 14274)
+++ branches/1.2.x/platform/elements/html_head.elm.tpl	(.../html_head.elm.tpl)	(revision 14561)
@@ -2,6 +2,9 @@
 <!--## Meta Info (Keywords and Description) ##-->
 <meta http-equiv="Content-Type" content="text/html; charset=<inp2:lang.current_Field name='Charset'/>" />
 
+<link rel="icon" href="<inp2:m_BaseURL/>favicon.ico" type="image/x-icon" />
+<link rel="shortcut icon" href="<inp2:m_BaseURL/>favicon.ico" type="image/x-icon" />
+
 <meta name="Description" content="<inp2:st_PageInfo type='meta_description'/>" />
 <meta name="Keywords" content="<inp2:st_PageInfo type='meta_keywords'/>" />
 <!--## /Meta Keywords and Description ##-->
Index: branches/1.2.x/in-commerce/_install/english.lang
===================================================================
diff -u -N -r14274 -r14561
--- branches/1.2.x/in-commerce/_install/english.lang	(.../english.lang)	(revision 14274)
+++ branches/1.2.x/in-commerce/_install/english.lang	(.../english.lang)	(revision 14561)
@@ -451,6 +451,7 @@
 			<PHRASE Label="lu_text_AddProductReviewConfirm" Module="In-Commerce" Type="0">VGhhbmsgeW91IGZvciBjb21tZW50aW5nIHRoaXMgcHJvZHVjdC4=</PHRASE>
 			<PHRASE Label="lu_text_AddProductReviewPendingConfirm" Module="In-Commerce" Type="0">VGhhbmsgeW91IGZvciBjb21tZW50aW5nIHRoaXMgcHJvZHVjdCAtIGl0J3MgcGVuZGluZyBmb3IgYWRtaW5pc3RyYXRpdmUgYXBwcm92YWwu</PHRASE>
 			<PHRASE Label="lu_text_ConfirmPasswordReset" Module="In-Commerce" Type="0">UGxlYXNlIGNvbmZpcm0gdGhhdCB5b3Ugd2FudCB0byByZXNldCB5b3VyIHBhc3N3b3JkLg==</PHRASE>
+			<PHRASE Label="lu_text_MulticardsContinue" Module="In-Commerce" Type="0">Q29udGludWU=</PHRASE>
 			<PHRASE Label="lu_text_nofilesforthisproduct" Module="In-Commerce" Type="0">Tm8gZmlsZXMgYXZhaWxhYmxlLg==</PHRASE>
 			<PHRASE Label="lu_text_NoProductReviewPermission" Module="In-Commerce" Type="0">Tm8gcGVybWlzc2lvbnMgdG8gY29tbWVudCB0aGlzIHByb2R1Y3Qu</PHRASE>
 			<PHRASE Label="lu_text_WeAcceptCreditCards" Module="In-Commerce" Type="0">V2UgQWNjZXB0IENyZWRpdCBDYXJkcw==</PHRASE>