launcher fix
Merge branch 'master' of github.com:redpois0n/JarToApp

Conflicts:
	src/files/launcher