Merge branch 'master' into multidirs
nested body tags issue
Merge branch 'multidirs' into beta

Conflicts:
	ChangeLog
Merge branch 'beta' into beta-ics
Merge branch 'ice-cream-sandwich' into beta-ics
Merge branch 'master' into ice-cream-sandwich
Merge branch 'master' into multidirs
Merge branch 'multidirs' into beta
Merge branch 'beta' into beta-ics
Merge branch 'ice-cream-sandwich' into beta-ics
formatting
Merge branch 'beta' into beta-ics
Merge branch 'master' into ice-cream-sandwich
Merge branch 'master' into multidirs
Merge branch 'multidirs' into beta

Conflicts:
	src/org/geometerplus/android/fbreader/BookmarksActivity.java
Merge branch 'beta' into beta-ics
Merge branch 'ice-cream-sandwich' into beta-ics
Merge branch 'master' into ice-cream-sandwich
Merge branch 'master' into multidirs
Merge branch 'beta' into beta-ics