Added modality to the JNLP builder for issue #1. Testing whether this also comes through in the JNLP itself.
Furthermore base location should take into account HTTP or HTTPS for issue #2