Merge

Conflicts:
	.idea/artifacts/PermChecker_jar.xml
	source/gr/watchful/permchecker/datastructures/ModPack.java
	source/mainClass.java