Bug #3449 - Switch to unified GA account

public/index.html

@@ -13,7 +13,7 @@
   <![endif]-->
   <script type="text/javascript">
     var _gaq = _gaq || [];
-    _gaq.push(['_setAccount', 'UA-35433268-2']);
+    _gaq.push(['_setAccount', 'UA-35433268-12']);
     _gaq.push(['_setDomainName', 'webmaker.org']);
     _gaq.push(['_trackPageview']);
 
@@ -104,7 +104,7 @@
                   <p>Tell the story of a minifig hero by changing the location of Google Maps, text and images.  A great way to learn the concepts of "Web Native Cinema!"</p>
                 </div>
               </div>
-        
+
               <div class="span5">
                 <h4><a href="/templates/basic/?savedDataUrl=projects/wikihow.json">HowTo: chocolate-covered bacon</a></h4>
                 <div class="thumbnail preview-thumbnail">
@@ -116,7 +116,7 @@
                    <p>See how Popcorn Maker can make instructional videos pop in this step-by-step guide.</p>
                </div>
               </div>
-            
+
             </div>
             <div class="row project-items">
               <div class="span5">

public/templates/basic/index.html

@@ -31,7 +31,7 @@
   <script src="template.js" data-butter-exclude></script>
   <script type="text/javascript">
     var _gaq = _gaq || [];
-    _gaq.push(['_setAccount', 'UA-35433268-2']);
+    _gaq.push(['_setAccount', 'UA-35433268-12']);
     _gaq.push(['_setDomainName', 'webmaker.org']);
     _gaq.push(['_trackPageview']);
 

views/dashboard.jade

@@ -178,7 +178,7 @@ html
       }
     script
       var _gaq = _gaq || [];
-      _gaq.push(['_setAccount', 'UA-35433268-2']);
+      _gaq.push(['_setAccount', 'UA-35433268-12']);
       _gaq.push(['_setDomainName', 'webmaker.org']);
       _gaq.push(['_trackPageview']);
 
@@ -203,7 +203,7 @@ html
       | " and any uploaded images?
       p
         button.yes.butter-btn.btn-green Yes
-        | 
+        |
         button.no.butter-btn.btn-red No
 
     .table-container