Merge remote-tracking branch 'remotes/upstream/branch_1.1.0' into branch_1.1.0

Conflicts:
	designer/src/main/resources/public/silkroad/home-new.html