synchronization with beta branch
Merge branch 'master' into beta

Conflicts:
	src/org/geometerplus/android/fbreader/api/ApiClientImplementation.java
	src/org/geometerplus/android/fbreader/api/ApiMethods.java
	src/org/geometerplus/android/fbreader/api/ApiServerImplementation.java