Merge branch 'feature-encyclopedia' of...

Merge branch 'feature-encyclopedia' of gitlab.labs.nic.cz:mlatner/tablexia-libgdx into feature-encyclopedia

Conflicts:
	core/src/cz/nic/tablexia/util/ui/button/ImageTablexiaButton.java

core/src/cz/nic/tablexia/util/ui/button/ImageTablexiaButton.java

@@ -14,7 +14,8 @@ import cz.nic.tablexia.util.ScaleUtil;
  */
 public class ImageTablexiaButton extends StandardTablexiaButton {
 
-	private static final int	DEFAULT_ICON_ALIGN	= Align.left;
+	private static final int	DEFAULT_ICON_ALIGN			= Align.left;
+	private static final float 	DEFAULT_IMAGE_HEIGHT_RATIO 	= 2f / 3;
 
 	private int					 	iconAlign 		= DEFAULT_ICON_ALIGN;
 	private final Group 		 	ICON_LAYER 		= new Group();
@@ -90,7 +91,7 @@ public class ImageTablexiaButton extends StandardTablexiaButton {
 
 	private TablexiaButton setSizeForIcon(int align) {
 		Image icon = getActualIcon();
-		ScaleUtil.setImageHeight(icon, getInnerHeight() * 2 / 3);
+		ScaleUtil.setImageHeight(icon, getInnerHeight() * DEFAULT_IMAGE_HEIGHT_RATIO);
 		switch (align) {
 			case Align.left:
 				icon.setX(getActualPatch().getPadLeft() + icon.getWidth() / 2);