add jnlp.*
Merge origin/master