formatting
code cleanup
Merge branch 'beta' into beta-ics

Conflicts:
	src/org/geometerplus/android/fbreader/FBReader.java
no more beta version
Merge branch 'master' into ice-cream-sandwich
Merge branch 'beta' into beta-ics
Merge branch 'ice-cream-sandwich' into yota2
Merge branch 'master' into beta
Merge branch 'ice-cream-sandwich' into beta-ics
Merge branch 'beta-ics' into yotabeta
Merge branch 'yota2' into yotabeta
version => 2.0
Merge branch 'beta' into beta-ics

Conflicts:
	AndroidManifest.xml
Merge branch 'beta-ics' into yotabeta