formatting

Conflicts:

	src/org/geometerplus/zlibrary/core/util/ZLColor.java
Merge branch 'master' into ice-cream-sandwich
Merge branch 'master' into beta
Merge branch 'beta' into beta-ics
Merge branch 'ice-cream-sandwich' into beta-ics