Merge branch 'fix-getjson-xss' of https://github.com/dmgawel/helios-server...

Merge branch 'fix-getjson-xss' of https://github.com/dmgawel/helios-server into dmgawel-fix-getjson-xss

heliosbooth/build-helios-booth-compressed.txt

-uglifyjs js/jscrypto/class.js js/jscrypto/bigint.dummy.js js/jscrypto/jsbn.js js/jscrypto/jsbn2.js js/jscrypto/sjcl.js js/underscore-min.js js/jquery-1.2.2.min.js js/jquery.query-2.1.5.js js/jquery-jtemplates.js js/jquery.json.min.js js/jscrypto/bigint.js js/jscrypto/random.js js/jscrypto/elgamal.js js/jscrypto/sha1.js js/jscrypto/sha2.js js/jscrypto/helios.js > js/20140302-helios-booth-compressed.js
+uglifyjs js/jscrypto/class.js js/jscrypto/bigint.dummy.js js/jscrypto/jsbn.js js/jscrypto/jsbn2.js js/jscrypto/sjcl.js js/underscore-min.js js/jquery-1.2.6.min.js js/jquery.query-2.1.5.js js/jquery-jtemplates.js js/jquery.json.min.js js/jscrypto/bigint.js js/jscrypto/random.js js/jscrypto/elgamal.js js/jscrypto/sha1.js js/jscrypto/sha2.js js/jscrypto/helios.js > js/20140302-helios-booth-compressed.js

heliosbooth/single-ballot-verify.html

@@ -9,7 +9,7 @@
   <script language="javascript" src="js/jscrypto/jsbn2.js"></script>
   <script language="javascript" src="js/jscrypto/sjcl.js"></script>
   <script language="javascript" src="js/underscore-min.js"></script>
-  <script language="javascript" src="js/jquery-1.2.2.min.js"></script>
+  <script language="javascript" src="js/jquery-1.2.6.min.js"></script>
   <script language="javascript" src="js/jquery-jtemplates.js"></script>
   <script language="javascript" src="js/jquery.json.min.js"></script>
   <script language="javascript" src="js/jquery.query-2.1.5.js"></script>

heliosbooth/vote.html

@@ -13,7 +13,7 @@
   <script language="javascript" src="js/jscrypto/jsbn2.js"></script>
   <script language="javascript" src="js/jscrypto/sjcl.js"></script>
   <script language="javascript" src="js/underscore-min.js"></script>
-  <script language="javascript" src="js/jquery-1.2.2.min.js"></script>
+  <script language="javascript" src="js/jquery-1.2.6.min.js"></script>
   <script language="javascript" src="js/jquery.query-2.1.5.js"></script>
   <script language="javascript" src="js/jquery-jtemplates.js"></script>
   <script language="javascript" src="js/jquery.json.min.js"></script>