Merge branch 'dev' into release/v1.0.8

Author: Parth Shah

app/directives/challenge-tile/challenge-tile.directive.jade

@@ -63,7 +63,9 @@
       design-challenge-user-place(challenge="challenge", view="view")
 
     // Only show if not data science track
-    p.roles(ng-hide="challenge.track === 'DATA_SCIENCE'") #[span Role:  ] #[span {{challenge.userDetails.roles | listRoles}}]
+    p.roles
+      span(ng-hide="challenge.track === 'DATA_SCIENCE'") 
+        #[span Role:  ] #[span {{challenge.userDetails.roles | listRoles}}]
 
 .challenge.list-view(ng-show="view=='list'", ng-class="challenge.track")
   .active-challenge(ng-show="challenge.status === 'ACTIVE'")

app/directives/page-state-header/page-state-header.directive.jade

@@ -6,7 +6,9 @@
     .info
       .pic
         a(ui-sref="profile.about({userHandle: vm.profile.handle})")
-          img.profile-circle(ng-src="{{vm.profile.photoURL}}", loading-src="/images/ico-user-default.svg")
+          img.profile-circle(ng-if="vm.profile.photoURL", ng-src="{{vm.profile.photoURL}}")
+          img.profile-circle(ng-if="!vm.profile.photoURL", src="/images/ico-user-default.svg")
+            
       .user-stats(id="metrics", ng-hide="vm.loading")
         .handle(style="color:{{vm.handleColor}};") {{vm.profile.handle}}
         .money-earned(ng-hide="hideMoney")