re
re
Merge branch 'master' of https://github.com/hangzhou-JIMI/L-stone

Conflicts:
	L-stone/L-stone.userprefs
	L-stone/Library/CurrentLayout.dwlt