Merge branch 'master' into gh-pages

js/keyboard_input_manager.js

@@ -82,7 +82,7 @@ KeyboardInputManager.prototype.listen = function () {
 
   gameContainer.addEventListener(this.eventTouchstart, function (event) {
     if ((!window.navigator.msPointerEnabled && event.touches.length > 1) ||
-        event.targetTouches > 1 ||
+        event.targetTouches.length > 1 ||
         self.targetIsInput(event)) {
       return; // Ignore if touching with more than 1 finger or touching input
     }
@@ -104,7 +104,7 @@ KeyboardInputManager.prototype.listen = function () {
 
   gameContainer.addEventListener(this.eventTouchend, function (event) {
     if ((!window.navigator.msPointerEnabled && event.touches.length > 0) ||
-        event.targetTouches > 0 ||
+        event.targetTouches.length > 0 ||
         self.targetIsInput(event)) {
       return; // Ignore if still touching with one or more fingers or input
     }