getBookByFile(path) method
sync with intro branch + 'download failed' message
Merge branch 'master' into ice-cream-sandwich
Merge branch 'master' into beta
Merge branch 'beta' into beta-ics
Merge branch 'ice-cream-sandwich' into beta-ics
sync with intro-ics branch
Merge branch 'ice-cream-sandwich' into beta-ics
Merge branch 'ice-cream-sandwich' into yota2

Conflicts:
	src/org/geometerplus/android/fbreader/DisplayBookPopupAction.java
Merge branch 'yota2' into betayota
Merge branch 'beta-ics' into betayota
book title in wait message
Merge branch 'master' into ice-cream-sandwich
Merge branch 'master' into beta
Merge branch 'beta' into beta-ics
Merge branch 'ice-cream-sandwich' into beta-ics
Merge branch 'ice-cream-sandwich' into yota2
Merge branch 'beta-ics' into betayota
Merge branch 'yota2' into betayota
syntax error