some stuff in activity_view_lists.xml
Merge branch 'master' of https://github.com/blseich/Buk.git

Conflicts:
	res/layout/activity_view_lists.xml