Merge branch 'master' of https://github.com/PorMMo/PorMMo

Conflicts:
	Settings/SD.pmo
	target/PorMMo-1.0-SNAPSHOT-jar-with-dependencies.jar
	target/PorMMo-1.0-SNAPSHOT.jar
	target/maven-archiver/pom.properties
	target/surefire-reports/TEST-project.senior.app.pormmo.AppTest.xml
	target/surefire-reports/project.senior.app.pormmo.AppTest.txt
a
Fish Changes