synchronization with mainstream
code cleanup
Merge branch 'master' into ice-cream-sandwich
Merge branch 'ice-cream-sandwich' into yota

Conflicts:
	src/org/geometerplus/zlibrary/text/model/ZLTextPlainModel.java