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

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

Conflicts:
	EzHerald/.classpath