Merged master into 1.0.1

public/css/main.css

@@ -327,7 +327,7 @@ h1{font-family:"PT Sans Narrow","Helvetica Neue",sans-serif;font-size:2em;font-w
 .battle .battle_overlays .battle_overlay.weather.rain{background:rgba(0,48,196,0.3)}
 .battle .battle_overlays .battle_overlay.weather.hail{background:rgba(128,255,255,0.3)}
 .battle .battle_overlays .battle_overlay.weather.sand{background:-webkit-gradient(linear, left top, left bottom, color-stop(0, rgba(128,64,0,0.3)), color-stop(1, rgba(64,32,48,0.5)));background:-webkit-linear-gradient(top, rgba(128,64,0,0.3) 0, rgba(64,32,48,0.5) 100%);background:-moz-linear-gradient(top, rgba(128,64,0,0.3) 0, rgba(64,32,48,0.5) 100%);background:-o-linear-gradient(top, rgba(128,64,0,0.3) 0, rgba(64,32,48,0.5) 100%);background:-ms-linear-gradient(top, rgba(128,64,0,0.3) 0, rgba(64,32,48,0.5) 100%);background:linear-gradient(top, rgba(128,64,0,0.3) 0, rgba(64,32,48,0.5) 100%)}
-.battle .battle_overlays .battle_overlay.weather.sun{background:rgba(255,196,64,0.3)}
+.battle .battle_overlays .battle_overlay.weather.sun{opacity:.6 !important;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=60)" !important;filter:alpha(opacity=60) !important;background:rgba(255,196,64,0.3)}
 .battle .battle_pane{position:absolute;width:400px;height:300px;top:0;left:100px;}
 .battle .battle_pane .pokemon.bottom .pokemon-info{bottom:35%;left:200px}
 .battle .battle_pane .pokemon.bottom .sprite.fade{position:absolute;left:-20px;opacity:.3;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=30)";filter:alpha(opacity=30)}

public/js/app.js

@@ -1863,7 +1863,7 @@
       };
       slugSpecies = slugify(this.get('species'));
       slugForme = slugify(this.get('forme'));
-      return "//pokebattle.com/dex/pokemon/" + slugSpecies + "/" + slugForme;
+      return "//wiki.p-insurgence.com/" + slugSpecies;
     };
 
     Pokemon.prototype.getIllu = function() {

public/js/replays.js

@@ -1863,7 +1863,7 @@
       };
       slugSpecies = slugify(this.get('species'));
       slugForme = slugify(this.get('forme'));
-      return "//pokebattle.com/dex/pokemon/" + slugSpecies + "/" + slugForme;
+      return "//wiki.p-insurgence.com/" + slugSpecies;
     };
 
     Pokemon.prototype.getIllu = function() {