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

Conflicts:
	EzHerald/.classpath
	EzHerald/project.properties
	libABS/bin/libabs.jar
	libSlidingMenu/bin/libslidingmenu.jar
nothing