show correct dirs in file tree, do not show deleted books in recent list
updated ChangeLog
Merge branch 'master' into ice-cream-sandwich

Conflicts:
	ChangeLog
Merge branch 'ice-cream-sandwich' into yota2
Merge branch 'yota2' into yota