ir
dialog
dialog
Merge branch 'master' of https://github.com/Gymyung/LibraryMan.git
dia
sdf
Merge branch 'master' of https://github.com/Gymyung/LibraryMan.git

Conflicts:
	bin/resources.ap_
	gen/cn/gzu/libaraymana/R.java
	res/values/strings.xml
Merge branch 'master' of https://github.com/Gymyung/LibraryMan.git
Merge branch 'master' of https://github.com/Gymyung/LibraryMan.git

Conflicts:
	bin/resources.ap_
	gen/cn/gzu/libaraymana/R.java
	src/cn/gzu/libaraymana/activities/AddBookActivity.java