Fix bug with 'all' argument
Add Sample.asset to .gitignore
Merge branch 'sample-resource' into build_assets
Fix word parts substitution for shadow_cognates
Merge branch 'build_assets' into better_cognates_matching

Conflicts:
	preparation/resources/SampleResource/SampleResource.py
	preparation/resources/SampleResource/__init__.py
regenerate
restored assets
Fix tabs count check while decoding explanations
Merge branch 'decode-assert-fix'
Merge branch 'better_cognates_matching'

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

Conflicts:
	preparation/resources/SampleResource/SampleResource.py
	preparation/resources/SampleResource/__init__.py
implicit cast to str fixed