Merge pull request #515 from Martii/enUSdefaultForFavorite

Normalize to en-US locale for "favorite" instead of "favourite"

Auto-merge

Author: Martii

views/includes/scriptUserToolsPanel.html

@@ -12,7 +12,7 @@
       </div>
     </div>
     <ul class="nav nav-pills nav-justified">
-      <li><a href="{{{favouriteUrl}}}" class="{{^canFavourite}}disabled{{/canFavourite}}"><i class="fa fa-star{{^upvoted}}-o{{/upvoted}}"></i> Favourite</a></li>
+      <li><a href="{{{favoriteUrl}}}" class="{{^canFavorite}}disabled{{/canFavorite}}"><i class="fa fa-star{{^upvoted}}-o{{/upvoted}}"></i> Favorite</a></li>
       <li><a href="{{{flagUrl}}}" class="{{^canFlag}}disabled{{/canFlag}}"><i class="fa fa-flag{{^flagged}}-o{{/flagged}}"></i> {{#flagged}}Unflag{{/flagged}}{{^flagged}}Flag{{/flagged}}</a></li>
       <li><a href="{{forkUrl}}" class="{{^canFork}}disabled{{/canFork}}"><i class="fa fa-code-fork"></i> Fork</a></li>
     </ul>