Merge branch 'master' of https://github.com/7u83/SeSim

nbproject/private/private.properties

@@ -1,9 +0,0 @@
-compile.on.save=true
-do.depend=false
-do.jar=true
-javac.debug=true
-javadoc.preview=true
-jnlp.signing.keypass=123456
-jnlp.signing.storepass=123456
-user.properties.file=/home/tobias/.netbeans/8.1/build.properties
-ivy.home=/usr/share/java/

nbproject/project.properties

@@ -1,4 +1,4 @@
-#Mon, 27 Mar 2017 16:09:01 +0200
+#Thu, 13 Apr 2017 20:27:39 +0200
 annotation.processing.enabled=true
 annotation.processing.enabled.in.editor=false
 annotation.processing.processors.list=
@@ -71,7 +71,7 @@ jnlp.signed=true
 jnlp.signing=key
 jnlp.signing.alias=SeSim
 jnlp.signing.keystore=/home/tube/jkeystore
-main.class=gui.NewMDIApplication
+main.class=gui.SeSimApplication
 # Optional override of default Application-Library-Allowable-Codebase attribute identifying the locations where your signed RIA is expected to be found.
 manifest.custom.application.library.allowable.codebase=
 # Optional override of default Caller-Allowable-Codebase attribute identifying the domains from which JavaScript code can make calls to your RIA without security prompts.
@@ -93,5 +93,5 @@ run.test.classpath=${javac.test.classpath}\:${build.test.classes.dir}
 source.encoding=UTF-8
 src.dir=src
 test.src.dir=test
-
+ivy.home=/usr/share/java/
 ivy.classpath=lib/commons-cli-1.0-javadoc.jar\:lib/commons-cli-1.0-sources.jar\:lib/commons-cli-1.0.jar\:lib/commons-lang-2.0-javadoc.jar\:lib/commons-lang-2.0-sources.jar\:lib/commons-lang-2.0.jar\:lib/commons-logging-1.0.jar\:lib/json-20160810-javadoc.jar\:lib/json-20160810-sources.jar\:lib/json-20160810.jar