Merge branch 'book-info-activity'

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
	bin/classes.dex
	bin/classes/com/groupd2/doelibs/AddEditLoanableActivity$1.class
	bin/classes/com/groupd2/doelibs/AddEditLoanableActivity$2.class
	bin/classes/com/groupd2/doelibs/AddEditLoanableActivity$3.class
	bin/classes/com/groupd2/doelibs/AddEditLoanableActivity.class
	bin/classes/com/groupd2/doelibs/AddEditTitleActivity$1.class
	bin/classes/com/groupd2/doelibs/AddEditTitleActivity$2.class
	bin/classes/com/groupd2/doelibs/AddEditTitleActivity.class
	bin/classes/com/groupd2/doelibs/HandoutActivity.class
	bin/classes/com/groupd2/doelibs/LoginActivity$1.class
	bin/classes/com/groupd2/doelibs/LoginActivity.class
	bin/classes/com/groupd2/doelibs/MainActivity.class
	bin/classes/com/groupd2/doelibs/MyBorrowingsActivity$1.class
	bin/classes/com/groupd2/doelibs/MyBorrowingsActivity$2.class
	bin/classes/com/groupd2/doelibs/MyBorrowingsActivity.class
	bin/classes/com/groupd2/doelibs/MyInventoryActivity.class
	bin/classes/com/groupd2/doelibs/R$id.class
	bin/classes/com/groupd2/doelibs/R$layout.class
	bin/classes/com/groupd2/doelibs/R$menu.class
	bin/classes/com/groupd2/doelibs/R$string.class
	bin/classes/com/groupd2/doelibs/R$style.class
	bin/classes/com/groupd2/doelibs/ReturnLoanableActivity.class
	bin/classes/com/groupd2/doelibs/SearchActivity$1.class
	bin/classes/com/groupd2/doelibs/SearchActivity$2.class
	bin/classes/com/groupd2/doelibs/SearchActivity.class
	bin/classes/com/groupd2/doelibs/adapters/BorrowingAdapter.class
	bin/classes/com/groupd2/doelibs/adapters/InventoryAdapter.class
	bin/classes/com/groupd2/doelibs/adapters/ReservationAdapter.class
	bin/classes/com/groupd2/doelibs/adapters/SearchResultAdapter.class
	bin/classes/com/groupd2/doelibs/adapters/TwoLineAdapter.class
	bin/classes/com/groupd2/doelibs/helpers/ActivityWithSearchBar.class
	bin/classes/com/groupd2/doelibs/models/Book.class
	bin/classes/com/groupd2/doelibs/models/Loanable.class
	bin/classes/com/groupd2/doelibs/models/Reservation.class
	bin/classes/com/groupd2/doelibs/models/SearchResult.class
	bin/resources.ap_
	gen/com/groupd2/doelibs/R.java
	res/values/strings.xml
	src/com/groupd2/doelibs/AddEditTitleActivity.java