format code and organize imports
fixed warnings
Merge branch 'master' of github.com:Crigges/JMpq-v2

Conflicts:
	jMpq-v2/src/de/peeeq/jmpq/JMpqEditor.java