more changes
Merge branch 'master' of https://github.com/snasrallah/jnlp

Conflicts:
	jar/HelloWorld.jnlp