界面设计
Merge branch 'develop' of https://github.com/HeraldStudio/EzHerald into develop

Conflicts:
	.gradle/1.11/taskArtifacts/cache.properties.lock
	.gradle/1.11/taskArtifacts/fileHashes.bin
	.gradle/1.11/taskArtifacts/fileSnapshots.bin
	.gradle/1.11/taskArtifacts/outputFileStates.bin
	.gradle/1.11/taskArtifacts/taskArtifacts.bin
	.idea/workspace.xml