working on buttons and backgrounds
Merge branch 'master' of https://github.com/blseich/Buk.git

Conflicts:
	res/layout/activity_search_for_book.xml