Merge branch 'master' into develop

Conflicts:
	.gitignore
	app/lea/Util.go
	public/css/theme/basic.less
	public/css/theme/default.css
	public/css/theme/simple.css
	public/css/theme/writting-overwrite.css
	public/css/theme/writting.css