Merge branch 'mm' into develop

client/src/components/skill.btn.jsx

@@ -38,7 +38,7 @@ function Skill(props) {
     const s = construct.skills[i];
     const ko = construct.green_life.value === 0 ? 'ko' : '';
 
-    if (!s) {
+    if (!s || !game) {
         return (
             <button
                 disabled='true'

client/src/components/targeting.arrows.jsx

@@ -26,6 +26,7 @@ class TargetSvg extends Component {
     render(props, state) {
         const { game, account, animating, animTarget } = props;
         const { width, height } = state;
+        if (!game) return false; // game will be null when battle ends
 
         // resolutions happening
         // just put skill name up