Merge branch 'dev' into feature/quick-fixes-after-ga-release

* dev:
  map assembly competition -> assembly

Author: vikasrohit

app/filters/track.filter.js

@@ -9,6 +9,7 @@
 
       var map = {
         'UI_PROTOTYPE_COMPETITION': 'UI Prototype Competition',
+        'ASSEMBLY_COMPETITION': 'ASSEMBLY',
         'RIA_BUILD_COMPETITION': 'RIA Build Competition',
         'RIA_COMPONENT_COMPETITION': 'RIA Component Competition',
         'DEVELOP_MARATHON_MATCH': 'Marathon Match',

app/filters/underscore-strip.filter.js

@@ -5,6 +5,12 @@
 
   function underscoreStrip() {
     return function(string) {
+      var map = {
+        'ASSEMBLY_COMPETITION': 'ASSEMBLY'
+      };
+      if (map[string]) {
+        return map[string];
+      }
       if (!string) {
         return '';
       }