test
fix
Merge remote-tracking branch 'origin/v1.0-dev-Emil' into v1.0-dev-foooon

Conflicts:
	Simplanum Extension/manifest.json
Merge remote-tracking branch 'origin/v1.0-dev-Emil' into v1.0-dev-foooon

Conflicts:
	Simplanum Extension/manifest.json
добавлен модуль карты
merge with foooon
fix