Quick fix: hide splash on OSX. TODO: Implement real fix
Merge branch 'master' of https://github.com/arx-deidentifier/arx.git

Conflicts:
	src/gui/org/deidentifier/arx/gui/Main.java
Resolve merge artifacts
Fix warnings