Equalizer merge
Merge branch 'master' of https://github.com/frankred/jSona

Conflicts:
	src/de/roth/jsona/javafx/ViewController.java
	src/de/roth/jsona/logic/LogicInterfaceFX.java
	src/de/roth/jsona/logic/LogicManagerFX.java
	src/de/roth/jsona/mediaplayer/MediaPlayerManager.java
Organize imports