sddfd
Merge branch 'develop' of https://github.com/HeraldStudio/EzHerald into develop

Conflicts:
	.idea/encodings.xml
	.idea/workspace.xml