Merge branch 'master' into master

Author: hahn-kev

misc/site/index.html

@@ -447,5 +447,16 @@ <h4 class="feature-heading">Complex Example</h4>
       };
     });
   </script>
+
+  <script>
+    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+    (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+    m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+    })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+    ga('create', 'UA-46391685-1', 'auto');
+    ga('send', 'pageview');
+
+  </script>
 </body>
 </html>

package.json

@@ -51,7 +51,7 @@
     "grunt-jscs": "^0.7.1",
     "grunt-karma": "~0.8",
     "grunt-newer": "~1.1.0",
-    "grunt-ngdocs": "https://github.com/c0bra/grunt-ngdocs/tarball/0.2.7-custom2",
+    "grunt-ngdocs": "https://github.com/c0bra/grunt-ngdocs/tarball/0.2.7-custom3",
     "grunt-protractor-runner": "~2.0.0",
     "grunt-shell-spawn": "~0.3.0",
     "jit-grunt": "^0.8.0",