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

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