Merge pull request #979 from mitm001/master

Fixed how AppSetting mergeFrom checks for key mapping.

jme3-core/src/main/java/com/jme3/system/AppSettings.java

@@ -274,7 +274,7 @@ public final class AppSettings extends HashMap<String, Object> {
      */
     public void mergeFrom(AppSettings other) {
         for (String key : other.keySet()) {
-            if (get(key) == null) {
+            if( !this.containsKey(key) ) {
                 put(key, other.get(key));
             }
         }