完成搜索，查看图书详情，个人所借图书
Merge branch 'develop' of https://github.com/HeraldStudio/EzHerald into develop

Conflicts:
	EzHerald/.classpath
	EzHerald/libs/herald-web-services-api-1.1-20130815.143624-30.jar
	EzHerald/libs/herald-web-services-api-1.1-20130830.125040-41.jar
	EzHerald/libs/herald-web-services-api-1.1-SNAPSHOT.jar
有两个jar包，我pull下来时候同时存在
herald-web-services-api-1.1-SNAPSHOT
herald-web-services-api-1.1-20130830.125040-41
但是编译会报错，俩jar包含有相同内容
报错:Conversion to Dalvik format failed: Unable to execute dex:

我移除herald-web-services-api-1.1-20130830.125040-41之后，可以编译通过
Merge branch 'develop' of https://github.com/HeraldStudio/EzHerald into develop