synchronization with nook branch
Merge branch 'master' into ice-cream-sandwich

Conflicts:
	src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidLibrary.java