jnlp java version set to 7
Merge branch 'dev'
merging dev for new release v2.0.3