Merge branch 'dev'
quick-fix for bug not using https
Minor log change
minor changes in language file
Merge branch 'master' into dev
solved bug which prevented the webview to be showed if the user comes back to the same screen before 1000ms
Merge branch 'bug-fast-webview-not-showing' into dev