token auth from service
Merge branch 'master' into ice-cream-sandwich
Merge branch 'ice-cream-sandwich' into yota2
Merge branch 'yota2' into kindle

Conflicts:
	src/org/geometerplus/android/fbreader/network/auth/ActivityNetworkContext.java
	src/org/geometerplus/android/fbreader/network/auth/AndroidNetworkContext.java
	src/org/geometerplus/android/fbreader/network/auth/ServiceNetworkContext.java