synchronization with library-service branch
Merge branch 'master' into library-service

Conflicts:
	src/org/geometerplus/android/fbreader/ShowBookmarksAction.java
RunActivityAction has gone
Merge branch 'master' into library-service

Conflicts:
	src/org/geometerplus/fbreader/book/AbstractSerializer.java
cleanup
Merge branch 'master' into library-service

Conflicts:
	src/org/geometerplus/fbreader/library/Library.java