synchronization with library-service branch
Merge branch 'master' into multidirs
Merge branch 'multidirs' into beta
RunActivityAction has gone
Merge branch 'master' into multidirs
Merge branch 'multidirs' into beta

Conflicts:
	src/org/geometerplus/android/fbreader/RunActivityAction.java
cleanup
Merge branch 'master' into multidirs
Merge branch 'multidirs' into beta