need committed
Merge remote-tracking branch 'origin/Beta-test' into Beta-test

Conflicts:
	Library/CurrentLayout.dwlt