Merge branch 'master' into develop

app/assets/javascripts/src/Metamaps.js.erb

@@ -20,6 +20,7 @@ Metamaps.Erb['icons/wildcard.png'] = '<%= asset_path('icons/wildcard.png') %>'
 Metamaps.Erb['topic_description_signifier.png'] = '<%= asset_path('topic_description_signifier.png') %>'
 Metamaps.Erb['topic_link_signifier.png'] = '<%= asset_path('topic_link_signifier.png') %>'
 Metamaps.Erb['synapse16.png'] = '<%= asset_path('synapse16.png') %>'
+Metamaps.Metacodes = <%= Metacode.all.to_json.gsub(%r[(icon.*?)(\"},)], '\1?purple=stupid\2').html_safe %>
 
 Metamaps.Settings = {
   embed: false, // indicates that the app is on a page that is optimized for embedding in iFrames on other web pages

app/views/layouts/_foot.html.erb

@@ -7,7 +7,6 @@
     <% else %>
         Metamaps.Active.Mapper = null;
     <% end %>
-    Metamaps.Metacodes = <%= Metacode.all.to_json.html_safe %>;
 
     Metamaps.Loading = {
         loader: new CanvasLoader('loading'),

doc/production/first-deploy.md

@@ -69,8 +69,7 @@ Run this in the metamaps directory, still as metamaps:
 
 #### Nginx and SSL
 
-Now set up nginx - config stored on Linode, including relevant 
-environment variables.
+Now set up nginx - config stored on Linode, including relevant environment variables.
 
 Get an SSL certificate and encrypt it for the realtime video.