JNLP properties need to begin with jnlp
Merge branch 'master' of ssh://github.com/tcarver/Artemis