Backport startup links for different memory settings from beta
Merge branch 'master' into data_beta

Conflicts:
	src/main/applications/wrapper/webstart/web-root/index.html