code simplification
Merge branch 'beta' into beta-ics

Conflicts:
	src/org/geometerplus/fbreader/fbreader/FBReaderApp.java
code simplification
Merge branch 'master' into beta

Conflicts:
	src/org/geometerplus/fbreader/fbreader/FBReaderApp.java
synchronization with beta branch
Merge branch 'beta' into beta-ics
Merge branch 'master' into beta
Merge branch 'master' into ice-cream-sandwich
Merge branch 'ice-cream-sandwich' into beta-ics
synchronization with beta branch
synchronization with master branch
Merge branch 'master' into beta
Merge branch 'master' into ice-cream-sandwich
Merge branch 'beta' into beta-ics

Conflicts:
	src/org/geometerplus/fbreader/fbreader/FBReaderApp.java
Merge branch 'ice-cream-sandwich' into beta-ics