ZLNetworkRequest refactoring; httpmime library added; file upload
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/ActivityNetworkContext.java
synchronisation: file upload
Merge branch 'master' into ice-cream-sandwich
Merge branch 'ice-cream-sandwich' into yota2
Merge branch 'yota2' into kindle
added application/fb2+xml mime type
Merge branch 'master' into ice-cream-sandwich
Merge branch 'ice-cream-sandwich' into yota2
Merge branch 'yota2' into kindle