Merge branch 'master' of https://github.com/jMonkeyEngine/jmonkeyengine

jme3-core/src/main/java/com/jme3/scene/debug/Arrow.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009-2012 jMonkeyEngine
+ * Copyright (c) 2009-2018 jMonkeyEngine
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -56,7 +56,7 @@ public class Arrow extends Mesh {
         0.05f, 0, 0.9f, // tip right
         -0.05f, 0, 0.9f, // tip left
         0, 0.05f, 0.9f, // tip top
-        0, -0.05f, 0.9f, // tip buttom
+        0, -0.05f, 0.9f, // tip bottom
     };
 
     /**

jme3-niftygui/src/main/java/com/jme3/niftygui/InputSystemJme.java

@@ -95,7 +95,7 @@ public class InputSystemJme implements InputSystem, RawInputListener {
 
     /**
      * @param height The height of the viewport. Used to convert
-     * buttom-left origin to upper-left origin.
+     * bottom-left origin to upper-left origin.
      */
     public void setHeight(int height) {
         this.height = height;