removed old authentication scheme
Merge branch 'master' into beta
removed old authentication scheme
Merge branch 'master' into ice-cream-sandwich
Merge branch 'master' into beta

Conflicts:
	src/org/geometerplus/zlibrary/ui/android/image/BitmapImageData.java
compilation issue
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

Conflicts:
	src/org/geometerplus/fbreader/formats/PdfPluginFormatPlugin.java
Merge branch 'yota2' into betayota
BearerAuthenticator class
Merge branch 'master' into beta
Merge branch 'beta' into beta-ics
Merge branch 'master' into ice-cream-sandwich
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