Maskinopdateringer + priser (SPO)
Merge branch 'master' of https://github.com/Haarslev/Shared-files

Conflicts:
	Model/Haarslev_industries.xml
	Model/data/cost_price_EU.csv
	Model/workspace.xml