Merge branch 'master' into tag-colour-preview-rebase

diff --cc app/assets/javascripts/index.js
index 4a8d8d9173130fd4c59e006021301b2e09b18101,2c7d70e11ad99603056546396c017cc7e1711ddc..562eb80fdd2fe1d7d59c5c6fa5c17df6291cf78a
--- 1/app/assets/javascripts/index.js
--- 2/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@@ -334,13 -347,9 +347,13 @@@ $(document).ready(function () 
            });
          }
        });
 +      
 +      $('.colour-preview-box').each(function () {
 +        $(this).css("background-color", $(this).data("colour"));
 +      });
      }
  
-     page.unload = function() {
+     page.unload = function () {
        map.removeObject();
      };
  

diff --cc app/assets/stylesheets/common.scss
Simple merge

diff --cc config/locales/en.yml
Simple merge