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

Conflicts:
	.idea/libraries/android_support_v4.xml