Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/classes/com/example/booklocator/BookListActivity.class

Signed-off-by: iftekhar-ahmed <bit0220iftekhar@hotmail.com>