Menu creation revamp. Functional settings creation.
Revert "Generated Javadocs into /doc"

This reverts commit 240fe1f4e2cd70adf904cfe6057656af53a09b0a.
	modified:   application/src/controlPackage/SoundManager.java
Merge branch 'iss10_Settings' into develop
Merge branch 'develop' of https://github.com/watacoso/nofutureball into develop

Conflicts:
	application/src/com/github/nofutureball/control/AudioCollection.java
	application/src/com/github/nofutureball/control/LevelManager.java
	application/src/com/github/nofutureball/control/SoundManager.java
	application/src/com/github/nofutureball/entity/GameObject.java
	application/src/com/github/nofutureball/main/Window.java
	application/src/com/github/nofutureball/states/GameLevel.java
	application/src/com/github/nofutureball/states/Menu.java
	application/src/com/github/nofutureball/states/Pause.java
	application/src/com/github/nofutureball/states/PlayerSelect.java
	application/src/controlPackage/AudioCollection.java
	application/src/json/AudioCollection.java

	pulled from github
	Changes needed to adjust the effects of the merging