Merge branch 'master' into barnet-integration

(prior to go-live... amongst other things, the Barnet web templates had changed.
NB conflict with carton.lock, accepted master in full)

Conflicts:
	carton.lock

1 files changed, 0 insertions, 10 deletions

diff --git a/web/cobrands/barnet/javascript/jquery-cookie-min.js b/web/cobrands/barnet/javascript/jquery-cookie-min.js
deleted file mode 100644
index 37fe78ad6..000000000
--- a/web/cobrands/barnet/javascript/jquery-cookie-min.js
+++ /dev/null
@@ -1,10 +0,0 @@
-/**

- * Cookie plugin

- *

- * Copyright (c) 2006 Klaus Hartl (stilbuero.de)

- * Dual licensed under the MIT and GPL licenses:

- * http://www.opensource.org/licenses/mit-license.php

- * http://www.gnu.org/licenses/gpl.html

- *

- */

-jQuery.cookie=function(name,value,options){if(typeof value!='undefined'){options=options||{};if(value===null){value='';options.expires=-1;}var expires='';if(options.expires&&(typeof options.expires=='number'||options.expires.toUTCString)){var date;if(typeof options.expires=='number'){date=new Date();date.setTime(date.getTime()+(options.expires*24*60*60*1000));}else{date=options.expires;}expires='; expires='+date.toUTCString();}var path=options.path?'; path='+(options.path):'';var domain=options.domain?'; domain='+(options.domain):'';var secure=options.secure?'; secure':'';document.cookie=[name,'=',encodeURIComponent(value),expires,path,domain,secure].join('');}else{var cookieValue=null;if(document.cookie&&document.cookie!=''){var cookies=document.cookie.split(';');for(var i=0;i<cookies.length;i++){var cookie=jQuery.trim(cookies[i]);if(cookie.substring(0,name.length+1)==(name+'=')){cookieValue=decodeURIComponent(cookie.substring(name.length+1));break;}}}return cookieValue;}};
\ No newline at end of file