Merge remote-tracking branch 'refs/remotes/upstream/master'

Conflicts:
	build/prod/cyberchef.htm
	build/prod/index.html
	build/prod/scripts.js
	src/static/stats.txt

src/js/config/OperationConfig.js

@@ -1421,7 +1421,7 @@ var OperationConfig = {
         ]
     },
     "ROT47": {
-        description: "A slightly more complex variation of a caesar cipher, which includes ASCII characters too. (default 47)",
+        description: "A slightly more complex variation of a caesar cipher, which includes ASCII characters from 33 '!' to 126 '~'. Default rotation: 47.",
         run: Rotate.run_rot47,
         highlight: true,
         highlight_reverse: true,

src/js/operations/Rotate.js

@@ -1,7 +1,7 @@
 /**
  * Bit rotation operations.
  *
- * @author n1474335 [n1474335@gmail.com] & Matt C [matt@artemisbot.pw]
+ * @author n1474335 [n1474335@gmail.com]
  * @copyright Crown Copyright 2016
  * @license Apache-2.0
  *
@@ -135,6 +135,7 @@ var Rotate = {
     /**
      * ROT47 operation.
      *
+     * @author Matt C [matt@artemisbot.pw]
      * @param {byte_array} input
      * @param {Object[]} args
      * @returns {byte_array}

src/js/views/html/OperationsWaiter.js

@@ -71,6 +71,7 @@ OperationsWaiter.prototype.search_operations = function(e) {
             str = el.value;
         
         while (search_results_el.firstChild) {
+            $(search_results_el.firstChild).popover("destroy");
             search_results_el.removeChild(search_results_el.firstChild);
         }
         

src/static/stats.txt

@@ -1,18 +1,32 @@
+<<<<<<< HEAD
 202	source files
 104399	lines
 	size
 
 136	JavaScript source files
 95309	lines
+=======
+203	source files
+104274	lines
+4.0M	size
+
+136	JavaScript source files
+95184	lines
+>>>>>>> master
 3.5M	size
 
 78	third party JavaScript source files
 76377	lines
-2.8M	size
+2.7M	size
 
 58	first party JavaScript source files
+<<<<<<< HEAD
 18932	lines
 740K	size
+=======
+18807	lines
+728K	size
+>>>>>>> master
 
 3.2M	uncompressed JavaScript size
 1.7M	compressed JavaScript size