Merge branch 'better_cognates_matching'

Conflicts:
	preparation/tools/build_assets.py
Merge branch 'show-evolution'