Merge remote-tracking branch 'origin/feature-encyclopedia' into feature-encyclopedia

Conflicts:
	core/src/cz/nic/tablexia/screen/encyclopedia/EncyclopediaScreen.java
	core/src/cz/nic/tablexia/screen/encyclopedia/content/model/Header.java
	core/src/cz/nic/tablexia/util/ui/button/TablexiaButton.java